#!/bin/bash
<<<<<<< HEAD
echo "hello from resolved conflict"
=======
echo "hello from conflict-demo branch"
>>>>>>> feature/conflict-demo
for i in {1..5}; do
echo "hello world $i"
done
